bitkeeper revision 1.1378 (426ca26eUpP7OInuOBvTyETb6y9VRQ)

Add /usr/lib64/python to the path for python tools so that they can be
found on 64-bit platforms.
Signed-off-by: Jerone Young <jyoung@us.ibm.com>

diff --git a/tools/misc/netfix b/tools/misc/netfix
index 32f1021732750bb26d70484b9239b51bbfa5fa34..e18923f1320099a4b6cce7a0b6c4367a575bdd0f 100644 (file)
--- a/tools/misc/netfix
+++ b/tools/misc/netfix
@@ -11,6 +11,7 @@ from getopt import getopt
 
 # add fallback path for non-native python path installs if needed
 sys.path.append('/usr/lib/python')
+sys.path.append('/usr/lib64/python')
 from xen.util.Brctl import *
 
 short_options = 'hvqni:b:c'

diff --git a/tools/misc/xend b/tools/misc/xend
index 57fbe14567fefdb9fda67fa9974685fd9f22cc01..355a3202921717f18ed86296b61ddb8d806600d5 100644 (file)
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -32,6 +32,7 @@ XCS_ARGS    = (XCS_EXEC, "-p", XCS_PIDFILE)
 
 # add fallback path for non-native python path installs if needed
 sys.path.append('/usr/lib/python')
+sys.path.append('/usr/lib64/python')
 from xen.xend.server import SrvDaemon
 
 class CheckError(ValueError):

diff --git a/tools/misc/xensv b/tools/misc/xensv
index 8596457cd7bc886ddb76e419b6cd7d62dc7fcf9c..339ed66a93b83b8430279ab34aab032da0767b6a 100755 (executable)
--- a/tools/misc/xensv
+++ b/tools/misc/xensv
@@ -24,6 +24,7 @@ import re
 
 # add fallback path for non-native python path installs if needed
 sys.path.append('/usr/lib/python')
+sys.path.append('/usr/lib64/python')
 from xen.xend.server.params import XEND_PID_FILE
 
 class CheckError(ValueError):

diff --git a/tools/misc/xm b/tools/misc/xm
index 6bf89313231420099d7609fba627f395c43f727d..80972ccef94369cc5df5306cde7ae0f89d873459 100755 (executable)
--- a/tools/misc/xm
+++ b/tools/misc/xm
@@ -4,6 +4,7 @@ import sys
 
 # add fallback path for non-native python path installs if needed
 sys.path.append('/usr/lib/python')
+sys.path.append('/usr/lib64/python')
 from xen.xm import main
 
 main.main(sys.argv)